Complete Magellan Navigator support. Thanx to Ron Parker!

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index b83592c6b33d05021989282f3b6df7a2fc08ffb5..5ed8c99fb6c4b0447f60535d7939fe39341142f6 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -1,4 +1,4 @@
-CFLAGS=-g -Icoldsync
+CFLAGS=-g -Icoldsync -belf -I/usr/local/include/
 
 FMTS=magproto.o gpx.o geo.o gpsman.o mapsend.o mapsource.o \
        gpsutil.o tiger.o pcx.o csv.o cetus.o gpspilot.o magnav.o \

diff --git a/gpsbabel/README b/gpsbabel/README
index c37b5f9ebbd2551a35c0472fc0a48f058c4157f7..608500c3b733e7dc4a550bf32c8eaec269f87cfe 100644 (file)
--- a/gpsbabel/README
+++ b/gpsbabel/README
@@ -124,6 +124,17 @@ THE FORMATS
        The file format for GPSPILOT (http://www.gpspilot.com) was provided
        by Ron Parker.  GPSbabel can currently read gpspilot files, but not
        write them.
+
+    MAGNAV
+
+        Magellan NAV Companion for Palm/OS is not really designed for this 
+        sort of use, but its file format is supported and with a little bit
+        of patience you can both read and write NAV Companion waypoints.
+        Please read README.magnav for further tips on getting waypoints
+        in and out of NAV Companion.  This conversion is based on partially
+        incomplete reverse-engineering of the record format, so it may not
+        work with all versions of NAV Companion.  It has been tested with 
+        version 2.10.
        
     PSP
 

diff --git a/gpsbabel/README.magnav b/gpsbabel/README.magnav
new file mode 100644 (file)
index 0000000..c0cf42e
--- /dev/null
+++ b/gpsbabel/README.magnav
@@ -0,0 +1,28 @@
+Translating NAV Companion waypoints to another format is as easy
+as with any other format.  Just find the Companion_Waypoints database
+in your palm backup directory and use it as the input file. 
+
+When translating waypoints back to NAV Companion, though, you need 
+to jump through some hoops:  
+
+First, you must merge any waypoints that already exist in the database 
+in your Palm Backup directory with the ones you are adding; failure to 
+do so will result in only the new points being available in NAV Companion, 
+even if you give the new database a different name (it will overwrite 
+the old database, even in your backup directory.  That's a feature of 
+PalmOS, not of NAV Companion.)  
+
+To merge the databases, use a command line like the following:
+
+gpsbabel -i magnav -f Companion_Waypoints.PDB -i geo -f geocaching.loc -o magnav -F merged.pdb
+
+Second, you must use the installer to install your new PDB file.  Don't
+make the mistake of copying it over the existing Companion_Waypoints.PDB
+file; the one on the handheld will overwrite it rather than merging with
+it.
+
+Finally, because NAV Companion is not designed to work with desktop 
+applications, you must tell NAV Companion that its waypoints database 
+has changed out from under it.  One way to do this is to go to the 
+waypoints screen and attempt to scroll; that will force it to reread 
+the database and fix the record pointers that it keeps on the heap.

diff --git a/gpsbabel/reference/magnav.pdb b/gpsbabel/reference/magnav.pdb
new file mode 100644 (file)
index 0000000..1a851c3
Binary files /dev/null and b/gpsbabel/reference/magnav.pdb differ

diff --git a/gpsbabel/reference/magnavr.gpu b/gpsbabel/reference/magnavr.gpu
new file mode 100644 (file)
index 0000000..e23f702
--- /dev/null
+++ b/gpsbabel/reference/magnavr.gpu
@@ -0,0 +1,9 @@
+GCEBB    3597.203N 08713.470W 0000000m Mountain Bike Heaven by susy13 a
+GC1A37   3609.068N 08667.955W 0000000m The Troll by a182pilot & Famil a
+GC1C2B   3599.627N 08662.012W 0000000m Dive Bomber by JoGPS & family  a
+GC25A9   3603.848N 08664.862W 0000000m FOSTER by JoGPS & Family       a
+GC2723   3611.218N 08674.177W 0000000m Logan Lighthouse by JoGps & Fa a
+GC2B71   3606.408N 08679.052W 0000000m Ganier Cache by Susy1313       a
+GC309F   3608.777N 08680.973W 0000000m Shy's Hill by FireFighterEng33 a
+GC317A   3605.750N 08689.200W 0000000m GittyUp by JoGPS / Warner Park a
+GC317D   3608.280N 08686.728W 0000000m Inlighting by JoGPS / Warner P a

diff --git a/gpsbabel/testo b/gpsbabel/testo
index 3078951423b4a1e12cac2aa2e2214c16d04f217c..4da9e1cacc33446658946e35cf6de129bc442c7b 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -118,3 +118,19 @@ diff ${TMPDIR}/ozi.ozi reference
 ${PNAME} -i holux -f reference/paris.wpo -o holux -F ${TMPDIR}/paris.wpo
 diff reference/paris.wpo ${TMPDIR}/paris.wpo
 
+# Magellan NAV Companion for PalmOS
+# This format is hard to test, because each record and the database itself
+# contains the time of creation, so two otherwise identical files won't
+# compare accurately.  In any case, the files are binary so diff wouldn't
+# like them.  So, we convert the reference file to gpsutil and the converted
+# file to gpsutil and make sure they're the same, and that they're the same
+# as one converted on a known-working installation.  Unfortunately, this does
+# not verify that the appinfo block was written correctly.  However, it does
+# successfully test for some endianness errors that might otherwise go 
+# unnoticed.
+${PNAME} -i geo -f geocaching.loc -o magnav -F ${TMPDIR}/magnav.pdb
+${PNAME} -i magnav -f ${TMPDIR}/magnav.pdb -o gpsutil -F ${TMPDIR}/magnav.gpu
+${PNAME} -i magnav -f reference/magnav.pdb -o gpsutil -F ${TMPDIR}/magnavt.gpu
+diff ${TMPDIR}/magnavt.gpu ${TMPDIR}/magnav.gpu
+diff reference/magnavr.gpu ${TMPDIR}/magnav.gpu
+